RateLimit.Conditions need explicit scope
#1145
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
With Limitador v2.0, conditions need to specify where the variables are to be looked up. Variables coming from the envoy RLP are populated in the `descriptors` root binding. While the protocol allows for multiple descriptors (each with multiple entries), the wasm-shim will only ever use the first one, i.e. index 0. Signed-off-by: Alex Snaps <alex@wcgw.dev>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1145 +/- ##
==========================================
+ Coverage 83.33% 83.37% +0.04%
==========================================
Files 81 81
Lines 6943 6943
==========================================
+ Hits 5786 5789 +3
+ Misses 930 928 -2
+ Partials 227 226 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
|
|
Sorry Codecov, but you're on crack! |
| @@ -124,7 +124,7 @@ func (r *LimitadorLimitsReconciler) buildLimitadorLimits(ctx context.Context, st | |||
| Namespace: limitsNamespace, | |||
| MaxValue: maxValue, | |||
| Seconds: seconds, | |||
| Conditions: []string{fmt.Sprintf("%s == \"1\"", limitIdentifier)}, | |||
| Conditions: []string{fmt.Sprintf("descriptors[0][\"%s\"] == \"1\"", limitIdentifier)}, | |||
There was a problem hiding this comment.
Ah yes I remember seeing this in the limitador PR I approved but didn't connect the dots here
adam-cattermole
approved these changes
Jan 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With Limitador v2.0, conditions need to specify where the variables are to be looked up. Variables coming from the envoy RLP are populated in the
descriptorsroot binding. While the protocol allows for multiple descriptors (each with multiple entries), the wasm-shim will only ever use the first one, i.e. index 0.Fixes #1144